Python 3.15.0b3#232
Conversation
|
@ifitchet I was able to build python 3.15.0b3 on linux-64 locally: I'm waiting for AnacondaRecipes/python_abi-feedstock#6 to be unblocked on PBP |
| -if "%IncludeExternals%"=="true" call "%dir%get_externals.bat" | ||
| +rem if "%IncludeExternals%"=="true" call "%dir%get_externals.bat" | ||
|
|
||
| if "%do_pgo%" EQU "true" if "%platf%" EQU "x64" ( | ||
| if "%PROCESSOR_ARCHITEW6432%" NEQ "AMD64" if "%PROCESSOR_ARCHITECTURE%" NEQ "AMD64" ( | ||
| if /I "%target%"=="Clean" set clean=true | ||
| if /I "%target%"=="CleanAll" set clean=true |
There was a problem hiding this comment.
This looks wrong, btw. Our patch shouldn't be introducing new things -- although I got the same thing when I tried to regenerate the patches.
Maybe it works because "Hunk already applied" or something we'd need to look closely at the build output.
The first bit rem ... seems OK as that is in the original 0002-*.patch. But that is the only change in the original patch!
The second bit looks like git done goofed:
$git diff v3.14.6 v3.15.0b3 -- PCbuild/build.bat
...
@@ -115,6 +120,9 @@ if "%UseJIT%" NEQ "true" set IncludeLLVM=false
if "%IncludeExternals%"=="true" call "%dir%get_externals.bat"
+if /I "%target%"=="Clean" set clean=true
+if /I "%target%"=="CleanAll" set clean=true
+
if "%do_pgo%" EQU "true" if "%platf%" EQU "x64" (
if "%PROCESSOR_ARCHITEW6432%" NEQ "AMD64" if "%PROCESSOR_ARCHITECTURE%" NEQ "AMD64" (
echo.ERROR: Cannot cross-compile with PGO
...
So the if /I ... bits were in the original bump from 3.14.6 to 3.15.0b3. So they should not also be in our patch.
My suspicion is that git sees the if /I lines as having changed with the 3 lines of context and has included them.
However, it looks as though it has also deleted the if "%do_pga%" ... lines. Which would be bad... Did it echo "Cannot cross-compile with PGO" ??
Given that it built... 🤷
There was a problem hiding this comment.
Thanks for catching that.
0002 and 0004 still each have a single intentional change vs our master branch; the Clean/CleanAll and stdlib_zip lines are just upstream context from the 3.14→3.15 move.
0014 and 0022 were the real regressions — fixed in 633a0fe.
There was a problem hiding this comment.
Ah, the issue with 0022 is that it clashes with the line changed in 0008...
| @@ -1197,5 +1197,5 @@ index 00000000000..a73ea8a0e91 | |||
| + return hPython3 != NULL; | |||
| +} | |||
| -- | |||
There was a problem hiding this comment.
Similarly, here. In the original patch, the only change is to if os_name ...
$git diff v3.14.6 v3.15.0b3 -- Modules/getpath.py
...
@@ -697,12 +691,13 @@ def search_up(prefix, *landmarks, test=isfile):
library_dir = dirname(library)
else:
library_dir = executable_dir
- pythonpath.append(joinpath(library_dir, ZIP_LANDMARK))
+ stdlib_zip = joinpath(library_dir, ZIP_LANDMARK)
elif build_prefix:
# QUIRK: POSIX uses the default prefix when in the build directory
- pythonpath.append(joinpath(PREFIX, ZIP_LANDMARK))
+ stdlib_zip = joinpath(PREFIX, ZIP_LANDMARK)
else:
- pythonpath.append(joinpath(base_prefix, ZIP_LANDMARK))
+ stdlib_zip = joinpath(base_prefix, ZIP_LANDMARK)
+ pythonpath.append(stdlib_zip)
if os_name == 'nt' and use_environment and winreg:
# QUIRK: Windows also lists paths in the registry. Paths are stored
...
where you can see bits of the 3.14.6 -> 3.15.0b3 changes sneaking in.
🤔
Failed to submit graph for 4949dbaMessage: Error: Task public names must be unique. Duplicates found: test-python-feedstock-libpython-static-linux-64_py3.10_f36defc349dc4ff3 (2x), test-python-feedstock-libpython-static-linux-64_py3.11_5103fa0e98e53839 (2x), test-python-feedstock-libpython-static-linux-64_py3.12_68217b584edc6ef5 (2x), test-python-feedstock-libpython-static-linux-64_py3.13_f01367edffb3038d (2x), test-python-feedstock-libpython-static-linux-64_py3.14_b8479eb3daca0ce3 (2x), test-python-feedstock-libpython-static-linux-64_py3.15_d8a6903490ce8ab1 (2x), test-python-feedstock-libpython-static-linux-aarch64_py3.10_83add46caaa1cc8a (2x), test-python-feedstock-libpython-static-linux-aarch64_py3.11_7a5759a6cbfaf413 (2x), test-python-feedstock-libpython-static-linux-aarch64_py3.12_1deaa975d5bdb3ec (2x), test-python-feedstock-libpython-static-linux-aarch64_py3.13_5e921a841b911001 (2x), test-python-feedstock-libpython-static-linux-aarch64_py3.14_bcee649afa9bddcd (2x), test-python-feedstock-libpython-static-linux-aarch64_py3.15_a8a8b9cc673fe7b6 (2x), test-python-feedstock-libpython-static-osx-arm64_py3.10_8b0427ee414b8912 (2x), test-python-feedstock-libpython-static-osx-arm64_py3.11_080a7ca42a40b341 (2x), test-python-feedstock-libpython-static-osx-arm64_py3.12_a2db3043771da25c (2x), test-python-feedstock-libpython-static-osx-arm64_py3.13_19f7a051cf020c84 (2x), test-python-feedstock-libpython-static-osx-arm64_py3.14_92b7536fddff3185 (2x), test-python-feedstock-libpython-static-osx-arm64_py3.15_95bcde7542f69856 (2x), test-python-feedstock-libpython-static-win-64_py3.10_73e41a7c0c7cbb8c (2x), test-python-feedstock-libpython-static-win-64_py3.11_47746879e074edaf (2x), test-python-feedstock-libpython-static-win-64_py3.12_92ddb940c5700852 (2x), test-python-feedstock-libpython-static-win-64_py3.13_c96d6a2388e5c609 (2x), test-python-feedstock-libpython-static-win-64_py3.14_f98ff133c8b4e571 (2x), test-python-feedstock-libpython-static-win-64_py3.15_25e118e155e5f8d8 (2x) |
0014: keep tclExternalTommath when unvendoring tcl/tk paths. 0022: drop stale docstrings.h include; fix hunk counts and ItemGroup structure for 3.15 upstream _decimal.vcxproj. Co-authored-by: Cursor <cursoragent@cursor.com>
… patches 0001–0021, i.e. after 0008 adds the d1trimfile lines
…t post-0001–0021 state
Destination channel: main
Links
Explanation of changes:
Notes: